From 6cf0660e74de8ae1462e5aa355be864553f01109 Mon Sep 17 00:00:00 2001
From: tsteven4 <tsteven4@users.noreply.github.com>
Date: Sat, 9 Mar 2019 09:44:04 -0700
Subject: [PATCH] clean up gui main and fix a png. (#313)

* clean up gui main and fix a png.

- fix libpng warning: iCCP: known incorrect sRGB profile
  issue with runit.png with pngcrush.

- fix includes for gui/main.cc, including removal of
  CoreFoundation.h
- use QApplication static methods instead of going directly
  to the underlying QCoreApplication static methods.

 - no path setting in GUI, instead pass the full path to gpsbabel when using QProcess::start.

in formatload.cc xlt() use qt methods to get a char* instead of
resorting to stdlib.  At this point Qt assumes all translate strings
are utf8.  However, the formatload xlt intent doesn't work because
1) MainWindow::LoadLanguage hasn't been called when
   MainWindow::loadFormats is called.
2) the translations don't exist for the format bits from gpsbabel
   that fromatload tries to translate.  I think this was the intent
   of the gpsbabel_*.ts files which are very out of date and no
   longer distributed.
---
 gui/formatload.cc    |  25 +++++++++-----
 gui/formatload.h     |   5 ++-
 gui/images/runit.png | Bin 5097 -> 2455 bytes
 gui/main.cc          |  36 ++++----------------
 gui/mainwindow.cc    |  78 ++++++++++++++++++++++++++++---------------
 gui/mainwindow.h     |  28 ++++++++++++----
 6 files changed, 102 insertions(+), 70 deletions(-)

diff --git a/gui/formatload.cc b/gui/formatload.cc
index fc806cf60..c8e1ed501 100644
--- a/gui/formatload.cc
+++ b/gui/formatload.cc
@@ -21,18 +21,27 @@
 //
 //------------------------------------------------------------------------
 
-#include <QProcess>
-#include <QMessageBox>
-#include <QTextStream>
-#include <QCoreApplication>
-#include <QApplication>
+#include <QtCore/QByteArray>        // for QByteArray
+#include <QtCore/QChar>             // for operator==, QChar
+#include <QtCore/QCharRef>          // for QCharRef
+#include <QtCore/QCoreApplication>  // for QCoreApplication
+#include <QtCore/QObject>           // for QObject
+#include <QtCore/QProcess>          // for QProcess
+#include <QtCore/QRegExp>           // for QRegExp
+#include <QtCore/QString>           // for QString, operator+
+#include <QtCore/QTextStream>       // for QTextStream
+#include <QtCore/QVariant>          // for QVariant
+#include <QtWidgets/QApplication>   // for QApplication
+#include <QtWidgets/QMessageBox>    // for QMessageBox
+
 #include "formatload.h"
-#include "appname.h"
+#include "appname.h"                // for appName
+
 
 //------------------------------------------------------------------------
 static QString xlt(const QString& f)
 {
-  return QCoreApplication::translate("", f.toStdString().c_str());
+  return QCoreApplication::translate("", f.toUtf8().constData());
 }
 
 //------------------------------------------------------------------------
@@ -127,7 +136,7 @@ bool FormatLoad::getFormats(QList<Format>& formatList)
   formatList.clear();
 
   QProcess babel;
-  babel.start("gpsbabel", QStringList() << "-^3");
+  babel.start(QApplication::applicationDirPath() + "/gpsbabel", QStringList() << "-^3");
   if (!babel.waitForStarted()) {
     return false;
   }
diff --git a/gui/formatload.h b/gui/formatload.h
index 2389d2444..370c1b598 100644
--- a/gui/formatload.h
+++ b/gui/formatload.h
@@ -25,7 +25,10 @@
 #ifndef FORMATLOAD_H
 #define FORMATLOAD_H
 
-#include "format.h"
+#include <QtCore/QList>        // for QList
+#include <QtCore/QStringList>  // for QStringList
+
+#include "format.h"            // for Format
 
 class FormatLoad
 {
diff --git a/gui/images/runit.png b/gui/images/runit.png
index de9b58068b1cc952d4191c6fa613128687c26464..1ab7a1db7d95e39c0ab9e60b0444007fdfebb26a 100644
GIT binary patch
delta 2425
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

literal 5097
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
LNkvXXu0mjftBjLt

diff --git a/gui/main.cc b/gui/main.cc
index d92cc7bb5..a5672a4fc 100644
--- a/gui/main.cc
+++ b/gui/main.cc
@@ -20,26 +20,11 @@
 //  USA
 //
 //------------------------------------------------------------------------
-#define _CRT_SECURE_NO_DEPRECATE 1
-#include <QMessageBox>
-#include <QFile>
-#include <QCoreApplication>
-#include <QLibraryInfo>
-#include <QIcon>
-#include <QTextCodec>
+#include <QtCore/QtGlobal>         // for QT_VERSION, QT_VERSION_CHECK
+#include <QtGui/QIcon>             // for QIcon
+#include <QtWidgets/QApplication>  // for QApplication
 
-#include "mainwindow.h"
-#include "gmapdlg.h"
-
-#ifdef _WIN32
-const char* pathSeparator = ";";
-#else
-const char* pathSeparator = ":";
-#endif
-
-#if defined (Q_OS_MAC)
-#include <CoreFoundation/CoreFoundation.h>
-#endif
+#include "mainwindow.h"             // for MainWindow
 
 //------------------------------------------------------------------------
 int main(int argc, char** argv)
@@ -51,16 +36,9 @@ int main(int argc, char** argv)
 
   QApplication app(argc, argv);
   QApplication::setWindowIcon(QIcon(":/images/appicon.png"));
-
-  QString newPath = "PATH=" + QApplication::applicationDirPath() +
-                    QString(pathSeparator) + getenv("PATH");
-  char* newPathEnv = new char[newPath.length() + 1];
-  strcpy(newPathEnv, newPath.toStdString().c_str());
-  putenv(newPathEnv);
-
-  QCoreApplication::setOrganizationName("GPSBabel");
-  QCoreApplication::setOrganizationDomain("gpsbabel.org");
-  QCoreApplication::setApplicationName("GPSBabel");
+  QApplication::setOrganizationName("GPSBabel");
+  QApplication::setOrganizationDomain("gpsbabel.org");
+  QApplication::setApplicationName("GPSBabel");
 
   MainWindow mainWindow(nullptr);
   mainWindow.show();
diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc
index 781c946dc..157e0db9e 100644
--- a/gui/mainwindow.cc
+++ b/gui/mainwindow.cc
@@ -19,32 +19,58 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111
 //  USA
 //
-#include <QDesktopServices>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QMimeData>
-#include <QProcess>
-#include <QSettings>
-#include <QTemporaryFile>
-#include <QTextStream>
-// #include <QDebug>
+#include <QtCore/QByteArray>           // for QByteArray
+#include <QtCore/QDate>                // for QDate
+#include <QtCore/QDateTime>            // for QDateTime
+#include <QtCore/QDir>                 // for QDir
+#include <QtCore/QEvent>               // for QEvent (& QEvent::LanguageChange, QEvent::LocaleChange)
+#include <QtCore/QFile>                // for QFile
+#include <QtCore/QFileInfo>            // for QFileInfo
+#include <QtCore/QLocale>              // for QLocale
+#include <QtCore/QMimeData>            // for QMimeData
+#include <QtCore/QProcess>             // for QProcess, QProcess::NotRunning
+#include <QtCore/QRegExp>              // for QRegExp
+#include <QtCore/QSettings>            // for QSettings
+#include <QtCore/QTemporaryFile>       // for QTemporaryFile
+#include <QtCore/QTime>                // for QTime
+#include <QtCore/QUrl>                 // for QUrl
+#include <QtCore/QVariant>             // for QVariant
+#include <QtCore/Qt>                   // for SmoothTransformation, WaitCursor
+#include <QtCore/QtGlobal>             // for foreach
+#include <QtGui/QCursor>               // for QCursor
+#include <QtGui/QDesktopServices>      // for QDesktopServices
+#include <QtGui/QIcon>                 // for QIcon
+#include <QtGui/QImage>                // for QImage
+#include <QtWidgets/QApplication>      // for QApplication, qApp
+#include <QtWidgets/QCheckBox>         // for QCheckBox
+#include <QtWidgets/QDialogButtonBox>  // for QDialogButtonBox
+#include <QtWidgets/QFileDialog>       // for QFileDialog
+#include <QtWidgets/QMessageBox>       // for QMessageBox, operator|, QMessageBox::Yes, QMessageBox::No
+#include <QtWidgets/QPlainTextEdit>    // for QPlainTextEdit
+#include <QtWidgets/QPushButton>       // for QPushButton
+#include <QtWidgets/QRadioButton>      // for QRadioButton
+#include <QtWidgets/QStackedWidget>    // for QStackedWidget
+
+#include <cstdlib>                     // for exit
 
 #include "mainwindow.h"
-#include "../gbversion.h"
-#include "aboutdlg.h"
-#include "advdlg.h"
-#include "appname.h"
-#include "babeldata.h"
-#include "donate.h"
-#include "filterdlg.h"
-#include "formatload.h"
-#include "gmapdlg.h"
-#include "help.h"
-#include "optionsdlg.h"
-#include "preferences.h"
-#include "processwait.h"
-#include "version_mismatch.h"
-#include "upgrade.h"
+#include "../gbversion.h"              // for VERSION
+#include "aboutdlg.h"                  // for AboutDlg
+#include "advdlg.h"                    // for AdvDlg
+#include "appname.h"                   // for appName
+#include "babeldata.h"                 // for BabelData
+#include "donate.h"                    // for Donate
+#include "filterdlg.h"                 // for FilterDialog
+#include "formatload.h"                // for FormatLoad
+#include "gmapdlg.h"                   // for GMapDialog
+#include "help.h"                      // for ShowHelp
+#include "optionsdlg.h"                // for OptionsDlg
+#include "preferences.h"               // for Preferences
+#include "processwait.h"               // for ProcessWaitDialog
+#include "upgrade.h"                   // for UpgradeCheck
+#include "version_mismatch.h"          // for VersionMismatch
+
+
 
 const int BabelData::noType_ = -1;
 const int BabelData::fileType_ = 0;
@@ -56,7 +82,7 @@ const int BabelData::deviceType_ = 1;
 QString MainWindow::findBabelVersion()
 {
   QProcess babel;
-  babel.start("gpsbabel", QStringList() << "-V");
+  babel.start(QApplication::applicationDirPath() + "/gpsbabel", QStringList() << "-V");
   if (!babel.waitForStarted()) {
     return QString();
   }
@@ -869,7 +895,7 @@ bool MainWindow::runGpsbabel(const QStringList& args, QString& errorString,
 {
   QProcess* proc = new QProcess(nullptr);
   QString name = "gpsbabel";
-  proc->start(name, args);
+  proc->start(QApplication::applicationDirPath() + '/' + name, args);
   ProcessWaitDialog* waitDlg = new ProcessWaitDialog(nullptr, proc);
 
   if (proc->state() == QProcess::NotRunning) {
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 31d539927..94920935c 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -22,13 +22,29 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "ui_mainwinui.h"
-#include "format.h"
-#include "filterdata.h"
-#include "babeldata.h"
-#include "upgrade.h"
+#include <QtCore/QEvent>          // for QEvent
+#include <QtCore/QList>           // for QList
+#include <QtCore/QObject>         // for QObject (& Q_OBJECT, slots)
+#include <QtCore/QString>         // for QString
+#include <QtCore/QStringList>     // for QStringList
+#include <QtCore/QTranslator>     // for QTranslator
+#include <QtGui/QCloseEvent>      // for QCloseEvent
+#include <QtGui/QDragEnterEvent>  // for QDragEnterEvent
+#include <QtGui/QDropEvent>       // for QDropEvent
+#include <QtGui/QPixmap>          // for QPixmap
+#include <QtWidgets/QAction>      // for QAction
+#include <QtWidgets/QComboBox>    // for QComboBox
+#include <QtWidgets/QLabel>       // for QLabel
+#include <QtWidgets/QLineEdit>    // for QLineEdit
+#include <QtWidgets/QMainWindow>  // for QMainWindow
+#include <QtWidgets/QWidget>      // for QWidget
+
+#include "babeldata.h"            // for BabelData
+#include "filterdata.h"           // for AllFiltersData
+#include "format.h"               // for Format
+#include "ui_mainwinui.h"         // for Ui_MainWindow
+#include "upgrade.h"              // for UpgradeCheck
 
-#include <QTranslator>
 
 class MainWindow: public QMainWindow
 {
-- 
2.30.2